(popup-menu): Allow user to select nothing.

diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el
index 6319ff3936b35d52e5ed57fa5d3411d9ad01e95a..9d4855fcc1fdf4b460d2a2fb3cc825d6a535466c 100644 (file)
--- a/lisp/emacs-lisp/lmenu.el
+++ b/lisp/emacs-lisp/lmenu.el
@@ -135,10 +135,11 @@ The syntax, more precisely:
   (let ((menu (make-lucid-menu-keymap (car menu-desc) (cdr menu-desc)))
        (pos (mouse-pixel-position))
        answer cmd)
-    (while menu
-      (setq answer (x-popup-menu (list (list (nth 1 pos) (nthcdr 2 pos))
-                                      (car pos))
-                                menu))
+    (while (and menu
+               (setq answer (x-popup-menu (list (list (nth 1 pos)
+                                                      (nthcdr 2 pos))
+                                                (car pos))
+                                          menu)))
       (setq cmd (lookup-key menu (apply 'vector answer)))
       (setq menu nil)
       (and cmd